telegram-desktop: make webkitgtk dependency optional #353243
Conversation
ilya-fedin
force-pushed
the
tdesktop-webkitgtk-optional
branch
3 times, most recently
from
01fa302 to
3c010d4
Compare
|
Result of 1 package failed to build:
3 packages built:
|
ilya-fedin
force-pushed
the
tdesktop-webkitgtk-optional
branch
from
3c010d4 to
e9327e9
Compare
ilya-fedin
force-pushed
the
tdesktop-webkitgtk-optional
branch
from
e9327e9 to
c8e55aa
Compare
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/with-webkit.nix
Outdated
Show resolved
Hide resolved
ilya-fedin
force-pushed
the
tdesktop-webkitgtk-optional
branch
from
c8e55aa to
23021c4
Compare
| ''; | ||
| postFixup = '' | ||
| mkdir -p $out/bin | ||
| makeBinaryWrapper {${telegram-desktop},$out}/bin/${telegram-desktop.meta.mainProgram} \ |
There was a problem hiding this comment.
It occurred to me: this is double wrapping right? Maybe we should follow the route of having a telegram-desktop-unwrapped.
There was a problem hiding this comment.
Yeah, it is... I'm not sure whether it would be trivial to get Qt wrapper args in a separate derivation?
There was a problem hiding this comment.
Me neither, we can ignore the aesthetic issue with double wrapping for now.
There was a problem hiding this comment.
Surprsingly, I actually managed to get it
There was a problem hiding this comment.
Would this be ok?
Another idea is to copy the unwrapped binary instead of depending on the non-webkit telegram-desktop package.
There was a problem hiding this comment.
My idea is to rename the original tdesktop package to tdesktop-unwrapped (minus the wrapper part), then create a new tdesktop package for the wrapper, with the argument withWebkitgtk.
There was a problem hiding this comment.
Hmm... That would mean each override has to provide two packages (unwrapped and wrapped)? And those sitting in by-name will get -unwrapped in their folder names?
There was a problem hiding this comment.
Not necessarily, as in NickCao@303fc78
There was a problem hiding this comment.
Oh, ok. Will you submit it? kotato looks broken though as it switches it from Qt 5 to Qt 6 which won't work...
P.S. reading the diff I noticed I forgot to remove kAudioObjectPropertyElementMain -> kAudioObjectPropertyElementMaster replacement which shouldn't be needed with the new sdk...
ilya-fedin
force-pushed
the
tdesktop-webkitgtk-optional
branch
from
23021c4 to
cae6e4f
Compare
ilya-fedin
force-pushed
the
tdesktop-webkitgtk-optional
branch
from
cae6e4f to
92a8c64
Compare
ofborg
bot
added
the
2.status: merge conflict
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.